merge trunk
authorK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:03 +0000 (09:24 +0900)
committerK. Handa <handa@gnu.org>
Sat, 18 Jan 2014 00:24:03 +0000 (09:24 +0900)
commitb4c33080c2b523c70e359e0299f04a4bd78f4873
tree96b2dbc7eaef32622d6435adca74588e8f1a2d59
parente298f90e01f95e003a9dd3c9b417f6bd48dc7004
parent39c6030a7b49d60f18f158bd2dc16a428c4d7195
merge trunk